Fix debian-expand-file-name-dfsg and describe-gnu-project (C-h C-p).

diff --git a/debian/changelog b/debian/changelog
index 9b3b83e47ab2c949688a341c0eeba9154db6581a..17a32764ae6aba1e03ffbfa727bacbf15616ccbb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+emacs22 (22.2+2-2) unstable; urgency=low
+
+  * Fix debian-expand-file-name-dfsg and describe-gnu-project (C-h C-p).
+    Thanks to Valery V. Vorotyntsev <valery.vv@gmail.com>.
+    (closes: #448391, #477215)
+
+ -- Rob Browning <rlb@defaultvalue.org>  Sat, 26 Apr 2008 20:15:07 -0700
+
 emacs22 (22.2+2-1) unstable; urgency=low
 
   * Move mh-e.texi here from the non-DFSG package because the license does

diff --git a/debian/patches/handle-dfsg-split.diff b/debian/patches/handle-dfsg-split.diff
index de6101edea0faeba9d6649234b314cc67be1cbe9..07abe1edd19a18d580d587f52b1176c4dc2abee0 100644 (file)
--- a/debian/patches/handle-dfsg-split.diff
+++ b/debian/patches/handle-dfsg-split.diff
@@ -29,7 +29,7 @@ Index: sid/lisp/help.el
 +(defun debian-expand-file-name-dfsg (filename)
 +  "Apply expand-file-name to FILENAME.
 +If expand-file-name does not find a file, append `.dfsg' and try again."
-+  (let ((file (expand-file-name file data-directory)))
++  (let ((file (expand-file-name filename data-directory)))
 +    (if (file-exists-p file)
 +        file
 +      (expand-file-name (concat file ".dfsg") data-directory))))
@@ -42,7 +42,7 @@ Index: sid/lisp/help.el
    "Display info on the GNU project."
    (interactive)
 -  (view-file (expand-file-name "THE-GNU-PROJECT" data-directory))
-+  (view-file (debian-expand-file-name-dfsg "THE-GNU-PROJECT" data-directory))
++  (view-file (debian-expand-file-name-dfsg "THE-GNU-PROJECT"))
    (goto-char (point-min)))
  
  (define-obsolete-function-alias 'describe-project 'describe-gnu-project "22.2")